bitkeeper revision 1.998 (40d81b1cVimdssGGhh_GI8JgoYVmkA)

Merge.

diff --cc tools/xend/lib/domain_controller.h
index 300426a879c1fbe7cd15bcabbcdb766d5b8eb4fc,8a9cea06640212f92f4213c605c3cca67431acc4..76dd164fcb88666ef26ba4d643dfb8db802868ba
--- 1/tools/xend/lib/domain_controller.h
--- 2/tools/xend/lib/domain_controller.h
+++ b/tools/xend/lib/domain_controller.h
@@@ -517,16 -518,25 +517,16 @@@ typedef struct 
  } PACKED netif_be_driver_status_changed_t; /* 4 bytes */
  
  
 -/******************************************************************************
 - * SUSPEND DEFINITIONS
 - */
 -
 -/*
 - * Subtypes for suspend messages.
 - */
 -/* None. */
 -
 -
  /******************************************************************************
-  * CONSOLE DEFINITIONS
+  * SHUTDOWN DEFINITIONS
   */
  
  /*
-  * Subtypes for console messages.
+  * Subtypes for shutdown messages.
   */
 -#define CMSG_SHUTDOWN_HALT      0   /* Shutdown and halt (don't die). */
 -#define CMSG_SHUTDOWN_POWEROFF  1   /* 'Poweroff' => clean death.     */
 -#define CMSG_SHUTDOWN_REBOOT    2   /* Shutdown and restart.          */
 +#define CMSG_SHUTDOWN_POWEROFF  0   /* Clean shutdown (SHUTDOWN_poweroff).   */
 +#define CMSG_SHUTDOWN_REBOOT    1   /* Clean shutdown (SHUTDOWN_reboot).     */
 +#define CMSG_SHUTDOWN_SUSPEND   2   /* Create suspend info, then             */
 +                                    /* SHUTDOWN_suspend.                     */
  
  #endif /* __DOMAIN_CONTROLLER_H__ */

diff --cc tools/xenmgr/lib/XendDomainInfo.py
Simple merge

diff --cc tools/xenmgr/lib/xm/create.py
Simple merge

diff --cc tools/xenmgr/lib/xm/main.py
Simple merge